19c3374db7f19a8174eff20d54c5ba6ec1d01556,opennms-services/src/main/java/org/opennms/netmgt/eventd/processor/JdbcEventWriter.java,JdbcEventWriter,getEventServiceId,#Event#,432

Before Change


     * @return
     */
    private int getEventServiceId(Event event) {
        int svcId = -1;
        if (event.getService() != null) {
            try {
                svcId = getServiceID(event.getService());
            } catch (SQLException e) {
                log().warn("EventWriter.add: Error converting service name \"" + event.getService() + "\" to an integer identifier, storing -1: e" + e, e);
            }
        }
        return svcId;
    }

    /**

After Change


     * @return
     */
    private int getEventServiceId(Event event) {
        if (event.getService() == null) {
            return -1;
        }
        
        try {
            return getServiceID(event.getService());
        } catch (Throwable t) {
            log().warn("EventWriter.add: Error converting service name \"" + event.getService() + "\" to an integer identifier, storing -1.  Error: " + t, t);
            return -1;
        }
    }